Renamed variable to reflect actual use
authorparkrrrr <parkrrrr@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Wed, 29 Mar 2006 21:22:43 +0000 (21:22 +0000)
committerparkrrrr <parkrrrr@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Wed, 29 Mar 2006 21:22:43 +0000 (21:22 +0000)
gpsbabel/google.c
gpsbabel/shape.c

index 0b116805064c23ce70f17ba8084adbd41891c7ce..55d4d46320a9f5919e8442473fced802b6aff650 100644 (file)
@@ -22,7 +22,7 @@
 static char *encoded_points = NULL;
 static char *encoded_levels = NULL;
 static char *script = NULL;
-static route_head *track_head;
+static route_head *route_head;
 static short_handle desc_handle;
 
 static FILE *fd;
@@ -131,7 +131,7 @@ void goog_segment( const char *args, const char **unused )
 {
        waypoint *wpt_tmp;
 
-       wpt_tmp = route_find_waypt_by_name( track_head, goog_segname);
+       wpt_tmp = route_find_waypt_by_name( route_head, goog_segname);
        if (wpt_tmp) {
                xfree(wpt_tmp->shortname);
                wpt_tmp->shortname = mkshort(desc_handle,args);
@@ -212,8 +212,8 @@ void goog_poly_e( const char *args, const char **unused )
         char *str = encoded_points;
        char *lstr = encoded_levels;
 
-       track_head = route_head_alloc();
-       route_add_head(track_head);
+       route_head = route_head_alloc();
+       route_add_head(route_head);
 
        while ( str && *str ) 
        {
@@ -243,7 +243,7 @@ void goog_poly_e( const char *args, const char **unused )
                        wpt_tmp->route_priority=level;
                        wpt_tmp->shortname = (char *) xmalloc(7);
                        sprintf( wpt_tmp->shortname, "\\%5.5x", serial++ );
-                       route_add_wpt(track_head, wpt_tmp);
+                       route_add_wpt(route_head, wpt_tmp);
                }
        }
        
index e3f6b6c634f72beeca663c61c7899bf79bad29ed..279b22536e7710dbf7168a107e43f3e547366d8c 100644 (file)
@@ -130,15 +130,15 @@ my_read(void)
                        
                if (shp->nSHPType == SHPT_ARC) {
                        int j;
-                       route_head *track_head = route_head_alloc();
-                       track_head->rte_name = xstrdup(name);
-                       route_add_head(track_head);
+                       route_head *routehead = route_head_alloc();
+                       routehead->rte_name = xstrdup(name);
+                       route_add_head(routehead);
                        for (j = 0; j < shp->nVertices; j++) {
                                wpt = waypt_new();
                                wpt->latitude = shp->padfY[j];
                                wpt->longitude = shp->padfX[j];
                                wpt->altitude = shp->padfZ[j];
-                               route_add_wpt(track_head, wpt);
+                               route_add_wpt(routehead, wpt);
                        }
                }